Another merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 11 Dec 2013 17:06:50 +0000 (19:06 +0200)
committerEli Zaretskii <eliz@gnu.org>
Wed, 11 Dec 2013 17:06:50 +0000 (19:06 +0200)
commit9ce334b93f20557800c19a5f5a0e0d9ef1b9fc61
tree91be407a43628651b70d41bc4ca5d5c662b45052
parenta653eb35a01a0299a6c0b2ec35c02d7efdc1178e
parent4bcac3775316731ecc345977514593d97e40f3e2
Another merge from trunk.